merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:32 +0000 (10:41 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:32 +0000 (10:41 +0900)

Trivial merge